Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix migration to DB version 242 from gvmd 20.08 (backport #1498) #1500

Merged
merged 4 commits into from
Apr 20, 2021
Merged

Fix migration to DB version 242 from gvmd 20.08 (backport #1498) #1500

merged 4 commits into from
Apr 20, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 20, 2021

This is an automatic backport of pull request #1498 done by Mergify.

Cherry-pick of 1cd170f has failed:

On branch mergify/bp/master/pr-1498
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 1cd170fb1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@timopollmeier
Fix migration to DB version 242 from gvmd 20.08
39bf84c 
When running the migration to DB version 242, the vt_severities table
only exists when migrating from a 21.04 development version, so the
migration for that table must be skipped if it does not exist.

(cherry picked from commit 0d51a47)
@timopollmeier
Add CHANGELOG entry for migration fix
bb197ed 
(cherry picked from commit 1cd170f)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner April 20, 2021 06:49
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Apr 20, 2021
@timopollmeier
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Apr 20, 2021

Command update: success

Branch has been successfully updated

@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Apr 20, 2021
@timopollmeier timopollmeier merged commit 3e53b77 into master Apr 20, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1498 branch April 20, 2021 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timopollmeier timopollmeier timopollmeier approved these changes

Assignees
No one assigned
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@timopollmeier